Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 31 May 2010 22:50:25 +0000 (22:50 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 31 May 2010 22:50:25 +0000 (22:50 +0000)

Trivial merge